Skip to content

fix: handle non-object entries in keyed reconcile#2788

Closed
cyphercodes wants to merge 1 commit into
solidjs:nextfrom
cyphercodes:fix/reconcile-nullable-keyed-array
Closed

fix: handle non-object entries in keyed reconcile#2788
cyphercodes wants to merge 1 commit into
solidjs:nextfrom
cyphercodes:fix/reconcile-nullable-keyed-array

Conversation

@cyphercodes

Copy link
Copy Markdown

Summary

  • Fix keyed reconcile in @solidjs/signals so array entries that are null, undefined, or primitives are treated as direct values instead of being wrapped as store objects.
  • Preserve keyed object reconciliation for wrappable entries while replacing non-object entries safely.
  • Add regression coverage for nullable keyed arrays and object-to-primitive array replacement.

Closes #2772

How did you test this change?

  • pnpm --dir packages/solid-signals exec vitest run tests/store/reconcile.test.ts
  • pnpm --filter @solidjs/signals test
  • pnpm --filter @solidjs/signals build
  • pnpm exec prettier --check packages/solid-signals/src/store/reconcile.ts packages/solid-signals/tests/store/reconcile.test.ts
  • git diff --check
  • pnpm test

@changeset-bot

changeset-bot Bot commented Jun 18, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: a50b451

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@ryansolid

Copy link
Copy Markdown
Member

Thanks for catching this and for the PR, @cyphercodes! 🙏

We've landed a fix for #2772 in bc92d002 on next. It takes a slightly broader approach than this PR: rather than guarding a single site, it guards every keyed-diff touch point (match / key / wrap) in both the fast and slow applyState paths, so null/undefined/primitive entries are safely preserved or replaced wholesale in any position (leading/trailing scans and the map/LIS reorder), including object→primitive and back.

We also added a UIBench-tree store-reconcile Tier-1 bench (reconcile-tree.bench.ts) and confirmed the guards add no measurable cost to the keyed reorder path.

Closing since the issue is now fixed on next, but thank you again — the report and repro were spot on.

@ryansolid ryansolid closed this Jul 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants